Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 20 Jun 2011 22:03:52 +0000 (15:03 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 20 Jun 2011 22:03:52 +0000 (15:03 -0700)

Trivial merge